Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

diff --combined arch/powerpc/Kconfig
index 53d0955,47fe256..9ae800d
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -140,6 -140,9 +140,9 @@@ config DEFAULT_UIMAG
          Used to allow a board to specify it wants a uImage built by default
        default n
  
+ config REDBOOT
+       bool
+ 
  config PPC64_SWSUSP
        bool
        depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
@@@ -342,14 -345,6 +345,14 @@@ config PPC_64K_PAGE
          while on hardware with such support, it will be used to map
          normal application pages.
  
 +config PPC_SUBPAGE_PROT
 +      bool "Support setting protections for 4k subpages"
 +      depends on PPC_64K_PAGES
 +      help
 +        This option adds support for a system call to allow user programs
 +        to set access permissions (read/write, readonly, or no access)
 +        on the 4k subpages of each 64k page.
 +
  config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
        depends on PPC64 && SMP

diff --combined drivers/net/fs_enet/fs_enet-main.c
index c83bd65,8220c70..42d94ed
--- 1/drivers/net/fs_enet/fs_enet-main.c
--- 2/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@@ -96,6 -96,9 +96,6 @@@ static int fs_enet_rx_napi(struct napi_
        u16 pkt_len, sc;
        int curidx;
  
 -      if (!netif_running(dev))
 -              return 0;
 -
        /*
         * First, grab all of the stats for the incoming packet.
         * These get messed up if we get called due to a busy condition.
@@@ -894,21 -897,14 +894,21 @@@ static void fs_get_regs(struct net_devi
  static int fs_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
  {
        struct fs_enet_private *fep = netdev_priv(dev);
 +
 +      if (!fep->phydev)
 +              return -ENODEV;
 +
        return phy_ethtool_gset(fep->phydev, cmd);
  }
  
  static int fs_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
  {
        struct fs_enet_private *fep = netdev_priv(dev);
 -      phy_ethtool_sset(fep->phydev, cmd);
 -      return 0;
 +
 +      if (!fep->phydev)
 +              return -ENODEV;
 +
 +      return phy_ethtool_sset(fep->phydev, cmd);
  }
  
  static int fs_nway_reset(struct net_device *dev)
@@@ -1178,8 -1174,15 +1178,15 @@@ static int __devinit find_phy(struct de
        struct device_node *phynode, *mdionode;
        struct resource res;
        int ret = 0, len;
+       const u32 *data;
+ 
+       data  = of_get_property(np, "fixed-link", NULL);
+       if (data) {
+               snprintf(fpi->bus_id, 16, PHY_ID_FMT, 0, *data);
+               return 0;
+       }
  
-       const u32 *data = of_get_property(np, "phy-handle", &len);
+       data = of_get_property(np, "phy-handle", &len);
        if (!data || len != 4)
                return -EINVAL;